gdk_key is a typedef, not a struct tag.

2005-03-17  Tor Lillqvist  <tml@novell.com>

	* gdk/gdkkeynames.c: gdk_key is a typedef, not a struct tag.

diff --git a/ChangeLog b/ChangeLog
index b15eeaf5c7c636233e3c3ab6e1ffe8aa87a2b97d..e792fcdb3db7065992ac18c3c9c9e59710e0d6f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-17  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/gdkkeynames.c: gdk_key is a typedef, not a struct tag.
+
 2005-03-16  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkprogressbar.c (gtk_progress_bar_get_ellipsize): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b15eeaf5c7c636233e3c3ab6e1ffe8aa87a2b97d..e792fcdb3db7065992ac18c3c9c9e59710e0d6f1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2005-03-17  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/gdkkeynames.c: gdk_key is a typedef, not a struct tag.
+
 2005-03-16  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkprogressbar.c (gtk_progress_bar_get_ellipsize): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b15eeaf5c7c636233e3c3ab6e1ffe8aa87a2b97d..e792fcdb3db7065992ac18c3c9c9e59710e0d6f1 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2005-03-17  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/gdkkeynames.c: gdk_key is a typedef, not a struct tag.
+
 2005-03-16  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkprogressbar.c (gtk_progress_bar_get_ellipsize): 

diff --git a/gdk/gdkkeynames.c b/gdk/gdkkeynames.c
index 00dd7588242dacb93667575f8732956c0da5e759..f4c5faf33a9e68d3ed2f3dd02d113ca0c1814fd8 100644 (file)
--- a/gdk/gdkkeynames.c
+++ b/gdk/gdkkeynames.c
@@ -37,19 +37,19 @@
 
 #include "keyname-table.h"
 
-#define GDK_NUM_KEYS (sizeof (gdk_keys_by_keyval) / sizeof (gdk_keys_by_keyval[0]))
+#define GDK_NUM_KEYS G_N_ELEMENTS (gdk_keys_by_keyval)
 
 static int
 gdk_keys_keyval_compare (const void *pkey, const void *pbase)
 {
-  return (*(int *) pkey) - ((struct gdk_key *) pbase)->keyval;
+  return (*(int *) pkey) - ((gdk_key *) pbase)->keyval;
 }
 
 gchar*
 gdk_keyval_name (guint keyval)
 {
   static gchar buf[100];
-  struct gdk_key *found;
+  gdk_key *found;
 
   /* Check for directly encoded 24-bit UCS characters: */
   if ((keyval & 0xff000000) == 0x01000000)
@@ -59,7 +59,7 @@ gdk_keyval_name (guint keyval)
     }
 
   found = bsearch (&keyval, gdk_keys_by_keyval,
-                  GDK_NUM_KEYS, sizeof (struct gdk_key),
+                  GDK_NUM_KEYS, sizeof (gdk_key),
                   gdk_keys_keyval_compare);
 
   if (found != NULL)
@@ -83,18 +83,18 @@ static int
 gdk_keys_name_compare (const void *pkey, const void *pbase)
 {
   return strcmp ((const char *) pkey, 
-                (const char *) (keynames + ((const struct gdk_key *) pbase)->offset));
+                (const char *) (keynames + ((const gdk_key *) pbase)->offset));
 }
 
 guint
 gdk_keyval_from_name (const gchar *keyval_name)
 {
-  struct gdk_key *found;
+  gdk_key *found;
 
   g_return_val_if_fail (keyval_name != NULL, 0);
   
   found = bsearch (keyval_name, gdk_keys_by_name,
-                  GDK_NUM_KEYS, sizeof (struct gdk_key),
+                  GDK_NUM_KEYS, sizeof (gdk_key),
                   gdk_keys_name_compare);
   if (found != NULL)
     return found->keyval;